Make GtkInvisible private

We can't quite get rid of its use in the inspector,
but we can make it private.

diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index 7c1a4a02477e505d16170625e1e0ecd62b5feaf6..a5e25803fa6b304ba697d232d84cbe57d1b122f0 100644 (file)
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -71,7 +71,6 @@
       <xi:include href="xml/gtkmessagedialog.xml" />
       <xi:include href="xml/gtkaboutdialog.xml" />
       <xi:include href="xml/gtkassistant.xml" />
-      <xi:include href="xml/gtkinvisible.xml" />
       <xi:include href="xml/gtkwindowgroup.xml" />
     </chapter>
 

diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 9893562527f33839d5bb776d1d5a1fb2ea214a8a..0e72ba604c3a071500225dc5d6fc0700238f850d 100644 (file)
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -1586,23 +1586,6 @@ gtk_im_multicontext_get_type
 GtkIMMulticontextPrivate
 </SECTION>
 
-<SECTION>
-<FILE>gtkinvisible</FILE>
-<TITLE>GtkInvisible</TITLE>
-GtkInvisible
-gtk_invisible_new
-<SUBSECTION Standard>
-GTK_INVISIBLE
-GTK_IS_INVISIBLE
-GTK_TYPE_INVISIBLE
-GTK_INVISIBLE_CLASS
-GTK_IS_INVISIBLE_CLASS
-GTK_INVISIBLE_GET_CLASS
-<SUBSECTION Private>
-gtk_invisible_get_type
-GtkInvisiblePrivate
-</SECTION>
-
 <SECTION>
 <FILE>gtklabel</FILE>
 <TITLE>GtkLabel</TITLE>

diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index d2bd9d704f99319a2956430ef3962d51e86bfec6..26c78079cfc4dba87a8368e1c30bf0e7c94c796c 100644 (file)
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -90,7 +90,6 @@ gtk_im_context_get_type
 gtk_im_context_simple_get_type
 gtk_im_multicontext_get_type
 gtk_info_bar_get_type
-gtk_invisible_get_type
 gtk_label_get_type
 gtk_layout_get_type
 gtk_link_button_get_type

diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
index 8966a3dca1aecfc972311a53c93564bd6889c581..5ccb245539087cb5e3f2a189c38e9ee85e300622 100644 (file)
--- a/gtk/gtk-autocleanups.h
+++ b/gtk/gtk-autocleanups.h
@@ -101,7 +101,6 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconTheme, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkIconView, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkImage, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkInfoBar, g_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkInvisible, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLayout, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLevelBar, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkLinkButton, g_object_unref)

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 4fb4fdec06b3894db72a65adfdd078c1d305d3d4..e5e1995bc0b12421be1dc450361b2407aa0dc2e2 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -132,7 +132,6 @@
 #include <gtk/gtkimcontextsimple.h>
 #include <gtk/gtkimmulticontext.h>
 #include <gtk/gtkinfobar.h>
-#include <gtk/gtkinvisible.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtklayout.h>
 #include <gtk/gtklevelbar.h>

diff --git a/gtk/gtkinvisible.c b/gtk/gtkinvisible.c
index 340780481e1c2a5e635499f5593552dfb9d6fbda..37821039a6bd3a3566e4710c01f373c4f908b758 100644 (file)
--- a/gtk/gtkinvisible.c
+++ b/gtk/gtkinvisible.c
@@ -24,7 +24,7 @@
 
 #include "config.h"
 #include <gdk/gdk.h>
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"

diff --git a/gtk/gtkinvisible.h b/gtk/gtkinvisible.h
deleted file mode 100644 (file)
index f625a35..0000000
--- a/gtk/gtkinvisible.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_INVISIBLE_H__
-#define __GTK_INVISIBLE_H__
-
-#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
-#endif
-
-#include <gtk/gtkwidget.h>
-
-G_BEGIN_DECLS
-
-#define GTK_TYPE_INVISIBLE             (gtk_invisible_get_type ())
-#define GTK_INVISIBLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
-#define GTK_INVISIBLE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-#define GTK_IS_INVISIBLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INVISIBLE))
-#define GTK_IS_INVISIBLE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
-#define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
-
-
-typedef struct _GtkInvisible              GtkInvisible;
-typedef struct _GtkInvisiblePrivate       GtkInvisiblePrivate;
-typedef struct _GtkInvisibleClass         GtkInvisibleClass;
-
-struct _GtkInvisible
-{
-  GtkWidget widget;
-
-  /*< private >*/
-  GtkInvisiblePrivate *priv;
-};
-
-struct _GtkInvisibleClass
-{
-  GtkWidgetClass parent_class;
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-};
-
-GDK_AVAILABLE_IN_ALL
-GType gtk_invisible_get_type (void) G_GNUC_CONST;
-
-GDK_AVAILABLE_IN_ALL
-GtkWidget* gtk_invisible_new            (void);
-GDK_AVAILABLE_IN_ALL
-GtkWidget* gtk_invisible_new_for_display(GdkDisplay   *display);
-GDK_AVAILABLE_IN_ALL
-void      gtk_invisible_set_display    (GtkInvisible *invisible,
-                                        GdkDisplay   *display);
-GDK_AVAILABLE_IN_ALL
-GdkDisplay*gtk_invisible_get_display   (GtkInvisible *invisible);
-
-G_END_DECLS
-
-#endif /* __GTK_INVISIBLE_H__ */

diff --git a/gtk/gtkinvisibleprivate.h b/gtk/gtkinvisibleprivate.h
new file mode 100644 (file)
index 0000000..f625a35
--- /dev/null
+++ b/gtk/gtkinvisibleprivate.h
@@ -0,0 +1,82 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_INVISIBLE_H__
+#define __GTK_INVISIBLE_H__
+
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkwidget.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_INVISIBLE             (gtk_invisible_get_type ())
+#define GTK_INVISIBLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_INVISIBLE, GtkInvisible))
+#define GTK_INVISIBLE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
+#define GTK_IS_INVISIBLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_INVISIBLE))
+#define GTK_IS_INVISIBLE_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_INVISIBLE))
+#define GTK_INVISIBLE_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_INVISIBLE, GtkInvisibleClass))
+
+
+typedef struct _GtkInvisible              GtkInvisible;
+typedef struct _GtkInvisiblePrivate       GtkInvisiblePrivate;
+typedef struct _GtkInvisibleClass         GtkInvisibleClass;
+
+struct _GtkInvisible
+{
+  GtkWidget widget;
+
+  /*< private >*/
+  GtkInvisiblePrivate *priv;
+};
+
+struct _GtkInvisibleClass
+{
+  GtkWidgetClass parent_class;
+
+  /* Padding for future expansion */
+  void (*_gtk_reserved1) (void);
+  void (*_gtk_reserved2) (void);
+  void (*_gtk_reserved3) (void);
+  void (*_gtk_reserved4) (void);
+};
+
+GDK_AVAILABLE_IN_ALL
+GType gtk_invisible_get_type (void) G_GNUC_CONST;
+
+GDK_AVAILABLE_IN_ALL
+GtkWidget* gtk_invisible_new            (void);
+GDK_AVAILABLE_IN_ALL
+GtkWidget* gtk_invisible_new_for_display(GdkDisplay   *display);
+GDK_AVAILABLE_IN_ALL
+void      gtk_invisible_set_display    (GtkInvisible *invisible,
+                                        GdkDisplay   *display);
+GDK_AVAILABLE_IN_ALL
+GdkDisplay*gtk_invisible_get_display   (GtkInvisible *invisible);
+
+G_END_DECLS
+
+#endif /* __GTK_INVISIBLE_H__ */

diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index f65881135892bd2122912985df82400972be53ce..c70a5e9e620ab8dcbf855165d5716db6aeadae30 100644 (file)
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -34,7 +34,7 @@
 #include "gtklistlistmodelprivate.h"
 #include "gtksizerequestcacheprivate.h"
 #include "gtkwindowprivate.h"
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkgesture.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/inspector/inspect-button.c b/gtk/inspector/inspect-button.c
index 489acb3286956a335f889489a7d142443e959db4..7297db3043e894b4235b13f402388bffffe4d6dc 100644 (file)
--- a/gtk/inspector/inspect-button.c
+++ b/gtk/inspector/inspect-button.c
@@ -31,7 +31,7 @@
 
 #include "gtkstack.h"
 #include "gtkmain.h"
-#include "gtkinvisible.h"
+#include "gtkinvisibleprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkgesturemultipress.h"
 #include "gtkeventcontrollermotion.h"

diff --git a/gtk/meson.build b/gtk/meson.build
index 8b43e7deef0c989ee06b48ba0bee1e61d4ee238a..d81a5ef923d3636c1c432e3a195c3d5f48ed749b 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -505,7 +505,6 @@ gtk_public_headers = files([
   'gtkimmodule.h',
   'gtkimmulticontext.h',
   'gtkinfobar.h',
-  'gtkinvisible.h',
   'gtklabel.h',
   'gtklayout.h',
   'gtklevelbar.h',

diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c
index cced1ccd460b867c33ff5d7d58b906c9580c39f4..3e64c2ff228d2a5d95b89c27e3604812b615dd71 100644 (file)
--- a/testsuite/gtk/objects-finalize.c
+++ b/testsuite/gtk/objects-finalize.c
@@ -84,7 +84,7 @@ test_finalize_object (gconstpointer data)
   g_object_weak_ref (object, check_finalized, &finalized);
 
   /* Toplevels are owned by GTK+, just tell GTK+ to destroy it */
-  if (GTK_IS_WINDOW (object) || GTK_IS_INVISIBLE (object))
+  if (GTK_IS_WINDOW (object))
     gtk_widget_destroy (GTK_WIDGET (object));
   else
     g_object_unref (object);